Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 23 May 2010 23:03:20 +0000 (23:03 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 23 May 2010 23:03:20 +0000 (23:03 +0000)

Trivial merge